[5.7] Fix a few DSL APIs #583
+663
−502
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.